Make AVP decoding goroutine-safe #186

higebu · 2023-11-24T07:46:37Z

Fixes #140

A read buffer will be reused when diam.ReadMessage() finishes. However, the byte slice in the read buffer will remain. This is because the byte slice is not copied during the decoding of AVPs.
Therefore, when trying to read diam.Message.AVP after diam.ReadMessage() has completed, a race condition occurs if the read buffer has already been reused.

go-diameter/diam/message.go

Lines 67 to 80 in 3ddd9fb

    
           func ReadMessage(reader io.Reader, dictionary *dict.Parser) (*Message, error) { 
        
           	buf := newReaderBuffer() 
        
           	defer putReaderBuffer(buf) 
        
           	m := &Message{dictionary: dictionary} 
        
           	cmd, stream, err := m.readHeader(reader, buf) 
        
           	if err != nil { 
        
           		return nil, err 
        
           	} 
        
           	m.stream = stream 
        
           	if err = m.readBody(reader, buf, cmd, stream); err != nil { 
        
           		return nil, err 
        
           	} 
        
           	return m, nil 
        
           }

Fixes fiorix#140

higebu force-pushed the fix-race branch from 1944ee1 to 3587e82 Compare November 24, 2023 07:50

Make AVP decoding goroutine-safe

278df7a

Fixes fiorix#140

higebu force-pushed the fix-race branch from 3587e82 to 278df7a Compare December 4, 2023 07:52

higebu changed the title ~~Copy byte slice in datatype decoding~~ Make AVP decoding goroutine-safe Dec 4, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make AVP decoding goroutine-safe #186

Make AVP decoding goroutine-safe #186

higebu commented Nov 24, 2023 •

edited

Loading

	func ReadMessage(reader io.Reader, dictionary dict.Parser) (Message, error) {
	buf := newReaderBuffer()
	defer putReaderBuffer(buf)
	m := &Message{dictionary: dictionary}
	cmd, stream, err := m.readHeader(reader, buf)
	if err != nil {
	return nil, err
	}
	m.stream = stream
	if err = m.readBody(reader, buf, cmd, stream); err != nil {
	return nil, err
	}
	return m, nil
	}

Make AVP decoding goroutine-safe #186

Are you sure you want to change the base?

Make AVP decoding goroutine-safe #186

Conversation

higebu commented Nov 24, 2023 • edited Loading

higebu commented Nov 24, 2023 •

edited

Loading